Merge branch 'master' of github.com:SiriDB/siridb-server into uvfs
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 6 Apr 2018 06:40:21 +0000 (08:40 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 6 Apr 2018 06:40:21 +0000 (08:40 +0200)

Trivial merge